Merge latest xen-unstable into xen-ia64-unstable to prep

for push back to xen-unstable

diff --cc linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
index 5d1e38564e1fc05d79d31daca54ea20a2e29f978,f2eb0036e5378adcb904b59637f9c2f1603a822d..d1853322e9adeba15d4c55452b5da294dbda9c42
--- 1/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- 2/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
@@@ -45,9 -45,8 +45,9 @@@
  #include <linux/blkdev.h>
  #include <linux/major.h>
  #include <linux/devfs_fs_kernel.h>
- #include <asm-xen/hypervisor.h>
+ #include <asm/hypervisor.h>
  #include <asm-xen/xenbus.h>
 +#include <asm-xen/gnttab.h>
  #include <asm-xen/xen-public/xen.h>
  #include <asm-xen/xen-public/io/blkif.h>
  #include <asm-xen/xen-public/io/ring.h>

diff --cc linux-2.6-xen-sparse/drivers/xen/console/console.c
index 087891ee4ddbc75494ba7f91897fa9983f86c45f,1091c6f903a3aaffe78e41f57b0e042eccd5cffd..f05d06136d06239ca630b0077cb7feb5c227d8ef
--- 1/linux-2.6-xen-sparse/drivers/xen/console/console.c
--- 2/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@@ -49,9 -49,8 +49,9 @@@
  #include <asm/io.h>
  #include <asm/irq.h>
  #include <asm/uaccess.h>
 +#include <asm-xen/xen-public/xen.h>
  #include <asm-xen/xen-public/event_channel.h>
- #include <asm-xen/hypervisor.h>
+ #include <asm/hypervisor.h>
  #include <asm-xen/evtchn.h>
  
  #include "xencons_ring.h"

diff --cc linux-2.6-xen-sparse/include/asm-xen/gnttab.h
Simple merge

diff --cc tools/examples/xen-backend.agent
index 91a5d0eb32a0336000e6aa8341e98903e2bd8d28,91a5d0eb32a0336000e6aa8341e98903e2bd8d28..6aefea139986f94a4bb5ec57b4e2d617b1094e96
--- 1/tools/examples/xen-backend.agent
--- 2/tools/examples/xen-backend.agent
+++ b/tools/examples/xen-backend.agent
@@@ -1,3 -1,3 +1,7 @@@
++\ 1
++copyrev: 0000000000000000000000000000000000000000
++copy: tools/examples/backend.hotplug
++\ 1
  #! /bin/sh
  
  #ACTION=add

diff --cc tools/libxc/xc_private.c
Simple merge

diff --cc tools/python/xen/xend/image.py
Simple merge